From 52558c6d0afa9cfa1f3a7a708f41648cd6356b97 Mon Sep 17 00:00:00 2001 From: Bas Couwenberg Date: Tue, 22 Aug 2023 08:13:42 +0200 Subject: [PATCH] Merge GCC 13 changes from 9.1.0+really9.1.0+dfsg2-7. --- debian/changelog | 15 +++++++++++++++ debian/patches/gcc-13.patch | 30 ++++++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 46 insertions(+) create mode 100644 debian/patches/gcc-13.patch diff --git a/debian/changelog b/debian/changelog index c7b595fbc..bebe208a7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +vtk9 (9.2.6+dfsg1-1+exp3) UNRELEASED; urgency=medium + + * Team upload. + * Merge GCC 13 changes from 9.1.0+really9.1.0+dfsg2-7. + + -- Bas Couwenberg Tue, 22 Aug 2023 08:13:38 +0200 + vtk9 (9.2.6+dfsg1-1+exp2) experimental; urgency=medium * Team upload. @@ -12,6 +19,14 @@ vtk9 (9.2.6+dfsg1-1+exp1) experimental; urgency=medium -- Anton Gladky Sat, 25 Mar 2023 15:34:05 +0100 +vtk9 (9.1.0+really9.1.0+dfsg2-7) unstable; urgency=medium + + * Team upload. + * Cherry-pick patch from upstream to fix FTBFS with gcc-13. + (Closes: #1037887) + + -- Michael R. Crusoe Tue, 22 Aug 2023 00:27:20 +0200 + vtk9 (9.1.0+really9.1.0+dfsg2-6) unstable; urgency=medium * Team upload. diff --git a/debian/patches/gcc-13.patch b/debian/patches/gcc-13.patch new file mode 100644 index 000000000..a61b4acef --- /dev/null +++ b/debian/patches/gcc-13.patch @@ -0,0 +1,30 @@ +From 1233ceec268d5366c66f5e79786ec784042b591b Mon Sep 17 00:00:00 2001 +From: Laurent Rineau +Date: Tue, 17 Jan 2023 16:18:53 +0100 +Subject: Add #include to compile with gcc13 +Origin: upstream, https://gitlab.kitware.com/vtk/vtk/-/commit/1233ceec268d5366c66f5e79786ec784042b591b + +The `vtkSEPReader` was introduced by MRs !4909 (from my former +collaborator Maxime) and !4938. Then it was highly modified by +!7516. The later MR is the one that introduced the uses of +`std::uint8_t` and `std::uint32_t`. + +Those types needs the inclusion of ``. +--- + IO/Image/vtkSEPReader.h | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +--- a/IO/Image/vtkSEPReader.h ++++ b/IO/Image/vtkSEPReader.h +@@ -25,8 +25,9 @@ + #include "vtkImageAlgorithm.h" + #include "vtkNew.h" // for ivars + +-#include // for std::array +-#include // for std::string ++#include // for std::array ++#include // for std::uint8_t and std::uint32_t ++#include // for std::string + + namespace details + { diff --git a/debian/patches/series b/debian/patches/series index 133ce5087..bbde548ff 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -11,3 +11,4 @@ 98_fix_mpi4py.py 99_fix_ftbfs.patch #110_vtk9_netcdf.patch +gcc-13.patch -- 2.30.2